Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 26 Nov 2011 08:27:20 +0000 (00:27 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 26 Nov 2011 08:27:20 +0000 (00:27 -0800)
commitd488517e67743f9e27119f78fcb6c8f68ab8f0c2
tree7ff6be914f77f31de78fd1a10330abea04cfd07e
parentf4c1aed6eb9df9c1c97bb9f7c053cbe150bd463e
parent267806a4fbfa7c3029256149896408fba099c359
Merge from trunk.